diff --git a/system/core/Common.php b/system/core/Common.php
index b9e3183..28c6083 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -538,7 +538,7 @@
 
 		$server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : FALSE;
 
-		if (strpos(php_sapi_name(), 'cgi') === 0)
+		if (strpos(PHP_SAPI, 'cgi') === 0)
 		{
 			header('Status: '.$code.' '.$text, TRUE);
 		}
diff --git a/system/core/Input.php b/system/core/Input.php
index 6f184a3..1e67ce1 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -872,7 +872,7 @@
 	 */
 	public function is_cli_request()
 	{
-		return (php_sapi_name() === 'cli' OR defined('STDIN'));
+		return (PHP_SAPI === 'cli' OR defined('STDIN'));
 	}
 
 	// --------------------------------------------------------------------